From 50345bb6c0f662ddb04cd6106be2bfe6b4589752 Mon Sep 17 00:00:00 2001
From: "kaf24@firebug.cl.cam.ac.uk" <kaf24@firebug.cl.cam.ac.uk>
Date: Fri, 24 Feb 2006 08:27:05 +0100
Subject: [PATCH] Cset 8950 adds shadow info dump in common code, however IA64
 has no shadow mode. Move it into arch specific stub instead.

Signed-off-by Kevin Tian <kevin.tian@intel.com>
---
 xen/arch/ia64/xen/xenmisc.c |  4 ++++
 xen/arch/x86/domain.c       | 20 ++++++++++++++++++++
 xen/common/keyhandler.c     | 18 ++----------------
 xen/include/xen/domain.h    |  2 ++
 4 files changed, 28 insertions(+), 16 deletions(-)

diff --git a/xen/arch/ia64/xen/xenmisc.c b/xen/arch/ia64/xen/xenmisc.c
index e73fab753e..375d88f76c 100644
--- a/xen/arch/ia64/xen/xenmisc.c
+++ b/xen/arch/ia64/xen/xenmisc.c
@@ -336,6 +336,10 @@ void continue_running(struct vcpu *same)
 	/* nothing to do */
 }
 
+void arch_dump_domain_info(struct domain *d)
+{
+}
+
 void panic_domain(struct pt_regs *regs, const char *fmt, ...)
 {
 	va_list args;
diff --git a/xen/arch/x86/domain.c b/xen/arch/x86/domain.c
index ee0bada316..1cec5b9aa0 100644
--- a/xen/arch/x86/domain.c
+++ b/xen/arch/x86/domain.c
@@ -986,6 +986,26 @@ void domain_relinquish_resources(struct domain *d)
     relinquish_memory(d, &d->page_list);
 }
 
+void arch_dump_domain_info(struct domain *d)
+{
+    if ( shadow_mode_enabled(d) )
+    {
+        printk("    shadow mode: ");
+        if ( shadow_mode_refcounts(d) )
+            printk("refcounts ");
+        if ( shadow_mode_write_all(d) )
+            printk("write_all ");
+        if ( shadow_mode_log_dirty(d) )
+            printk("log_dirty ");
+        if ( shadow_mode_translate(d) )
+            printk("translate ");
+        if ( shadow_mode_external(d) )
+            printk("external ");
+        if ( shadow_mode_wr_pt_pte(d) )
+            printk("wr_pt_pte ");
+        printk("\n");
+    }
+}
 
 /*
  * Local variables:
diff --git a/xen/common/keyhandler.c b/xen/common/keyhandler.c
index 0e9bd97e22..1b06e0dc3a 100644
--- a/xen/common/keyhandler.c
+++ b/xen/common/keyhandler.c
@@ -132,22 +132,8 @@ static void dump_domains(unsigned char key)
                d->handle[ 4], d->handle[ 5], d->handle[ 6], d->handle[ 7],
                d->handle[ 8], d->handle[ 9], d->handle[10], d->handle[11],
                d->handle[12], d->handle[13], d->handle[14], d->handle[15]);
-        if ( shadow_mode_enabled(d) ) {
-            printk("    shadow mode: ");
-            if ( shadow_mode_refcounts(d) )
-                printk("refcounts ");
-            if ( shadow_mode_write_all(d) )
-                printk("write_all ");
-            if ( shadow_mode_log_dirty(d) )
-                printk("log_dirty ");
-            if ( shadow_mode_translate(d) )
-                printk("translate ");
-            if ( shadow_mode_external(d) )
-                printk("external ");
-            if ( shadow_mode_wr_pt_pte(d) )
-                printk("wr_pt_pte ");
-            printk("\n");
-        }
+
+        arch_dump_domain_info(d);
 
         rangeset_domain_printk(d);
 
diff --git a/xen/include/xen/domain.h b/xen/include/xen/domain.h
index 4fee8e74cb..aa38ac0fc6 100644
--- a/xen/include/xen/domain.h
+++ b/xen/include/xen/domain.h
@@ -24,4 +24,6 @@ extern void domain_relinquish_resources(struct domain *d);
 
 extern void dump_pageframe_info(struct domain *d);
 
+extern void arch_dump_domain_info(struct domain *d);
+
 #endif /* __XEN_DOMAIN_H__ */
-- 
2.30.2